am 66a83ae6: Merge "Camera2: Add metadata keys and enum values" into klp-dev

* commit '66a83ae6500d735b5abb6a97c86addcb1c958d68':
  Camera2: Add metadata keys and enum values