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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09c260fa7fbb87852f48e56be6c59d1ac3f154a9