[automerger skipped] Do not include hidden secure cameras in camera1: getNumberOfCameras am: cf93540965
am: 665814684e -s ours
am skip reason: change_id I9d1721fd5e94fa7f692c3da52aa667ae9247d368 with SHA1 847947d80d is in history

Change-Id: Ib6db2347b00d36ca76555bd7774c4f0a77979368