Merge "Fix Surface HDR meta reset" am: 96611b93bb am: 008e733ce7

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

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