Merge "Camera: Allow synthetic extension metadata" into tm-dev am: eb177cd5 am: 53b01eb3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18801658



Change-Id: Id4bc3cea32f57dd893c27d0977771ea8b38213ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>