am 16e5a644: (-s ours) am 4ac84a42: Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE

* commit '16e5a6440f54b396219315bc27f49f103083393b':
  Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE