Fix NPE in SecureCameraActivity init

Change-Id: I2632d7baff0e08c0533157b149972466cedb679b
Merge remote branch 'cm/cm-10.1'