am 253f6830: (-s ours) am abeee0ec: Camera2: fix metadata symbols: DO NOT MERGE

# Via Android Git Automerger (1) and Igor Murashkin (1)
* commit '253f683018caa803499f4e612d53846f76072e89':
  Camera2: fix metadata symbols: DO NOT MERGE