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

Change-Id: Ib504f639f96c6c1680a18feac836ae561e23a1b0