am a9b4ed9e: am 20733ba9: am b1286a7a: am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev

* commit 'a9b4ed9ee65c3db1975defe1b6bb1afd91cd7ba6':
  Make vendor keys visible in Camera2 java APIs.