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

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

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