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

Merge "Merge "Fix customizer state" into rvc-dev am: 3aa99808 am: 2208d4b0 am: 6678ab57" into rvc-qpr-dev-plus-aosp am: 65143c4b

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

Change-Id: Ia9a08859e897673b71147148a4fe65dfc16af1de