Merge "[HDR]:UserDisabledHdrTypes is not updated after system reboot" am:...

Merge "[HDR]:UserDisabledHdrTypes is not updated after system reboot" am: 7c053765 am: b14ad943 am: 1c504bd1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2392843



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