Merge "CameraServiceProxy: Cleanups and receive more information from CameraService" into oc-dr1-dev am: 6a29ad5ede
am: a6ce4cee9f

Change-Id: Ie378e167b993a4ad717722337abb7df5ac1598c4