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

Change-Id: I56d5820bb5366b65e13b0808451095448186e00a