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

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