Merge "Camera: Handle the case of calling Uid being cameraserver" into rvc-dev am: ec77ef6932 am: cef0c2d431 am: de9227e2fc

Change-Id: Iee052a7c87229eaaa1f6d8835df30d3d2ac38a09