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

Change-Id: I7676e9125274f323a88fa7148406ddbcce23b912