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

Change-Id: I5816f58c6258806744e19b8a70c447109d426df4