am e0731653: (-s ours) am 803a8c76: Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT MERGE

# Via Android Git Automerger (1) and Igor Murashkin (1)
* commit 'e073165389625fcb54c4d6b2565a6ada2d125048':
  Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT MERGE