Merge "Camera: Handle the case of calling Uid being cameraserver" into rvc-dev...
Merge "Camera: Handle the case of calling Uid being cameraserver" into rvc-dev am: ec77ef69 am: 45f0b513 am: 4fa4b6e2
Change-Id: I7676e9125274f323a88fa7148406ddbcce23b912