Merge "Camera: fix wrong metadata pointer" am: 2610b34be2 am: a617c8aac7

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1500851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44cd9ffc2ef70772f23c0f14fca428939f7e77dc