am 2d861e87: Merge "Camera2: Fix build: Add new key to API" into klp-dev

* commit '2d861e87ae556b73d8bab5a6db20207a5653560f':
  Camera2: Fix build: Add new key to API