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

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



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