am 8c871175: am 3ba21e97: Merge "camera2: Rename CameraProperties to...
am 8c871175: am 3ba21e97: Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev
* commit '8c871175':
camera2: Rename CameraProperties to CameraCharacteristics