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

Change-Id: I88f946699006b41fc6f90c4365f3de75ae3a3381