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

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