Merge "CameraService: Clean up ICameraServiceProxy; send it more info" into oc-dr1-dev am: 437f48e64a
am: 63d16055f1

Change-Id: Idbdbb279845ff9286e74c62115d1c6f1114ec12c