Merge "Always provide metadata blob for hdr frames" am: 1549faf01e am: 980cf5dfca

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1944756

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