Merge "cameraserver: Avoiding deadlocks while calling isPublicallyHiddenSecureCamera()." into qt-qpr1-dev
am: 6112a9c691

Change-Id: I25bf3d62c68b294e490c24741af4f936bfa0d220