[automerger skipped] Merge "cameraserver: Avoiding deadlocks while calling isPublicallyHiddenSecureCamera()." into qt-qpr1-dev am: 6112a9c691 am: 40ffd15a79 -s ours
am: 8dc1180d5d -s ours
am skip reason: change_id I8562c83478b1fe8fbda7c85f97b995985666918d with SHA1 31706c85b1 is in history

Change-Id: Ia9aac02123475c33eb195bb6346bc24202053a1e