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

* commit '6914de6dd1d74fcf74e3247c89f9293fbf7bafe5':
  Camera: Implement getCameraCharacteristics