am 369af71e: am 6914de6d: Merge "Camera: Implement getCameraCharacteristics" into klp-dev

* commit '369af71eb7e402ee68b66b0f0ede5d4d40c857d1':
  Camera: Implement getCameraCharacteristics