Merge "Camera service: Add support for camera.device@3.3" into oc-mr1-dev
am: b45ee92406

Change-Id: I763feede1a7787cb81712e68c59ad905713eea8b