Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev