am 1e4e3825: Merge "camera2: Add key enumeration functionality to CameraMetadata" into klp-dev

* commit '1e4e38252f8eb44fe382e371e29857834cf9fc15':
  camera2: Add key enumeration functionality to CameraMetadata