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

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

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