Merge "Merge "Camera: update service to support HAL3.4" into nyc-dev am:...
Merge "Merge "Camera: update service to support HAL3.4" into nyc-dev am: f15d88da am: 1ac5a450" into nyc-mr1-dev-plus-aosp
am: 83319253
* commit '83319253':
Change-Id: I7bf55fb2816b67ff45acc1ac1c0deea49b3c6057