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

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