am 46e9befb: (-s ours) am 4c645d0a: Camera2: Fix metadata symbols: DO NOT MERGE

# Via Android Git Automerger (1) and Igor Murashkin (1)
* commit '46e9befbe45e0d53c7ad1cb0f570865c08335aab':
  Camera2: Fix metadata symbols: DO NOT MERGE