Merge "Merge "Fix customizer state" into rvc-dev am: 3aa99808 am:...

Merge "Merge "Fix customizer state" into rvc-dev am: 3aa99808 am: 2208d4b0" into rvc-d1-dev-plus-aosp am: a192c690 am: 3776e678

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

Change-Id: I949068d25300e34ae3d6c26266e0839442474d97