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

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

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