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

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