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

Merge "Fix customizer state" into rvc-dev am: 3aa99808 am: 1b41bd75 am: 2d164a13 am: a2f340aa

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

Change-Id: Ifb28153ff0884c67c0d250158da8fd82631e649c