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

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

Change-Id: Ibf2d96facd2511ca7ac5ef7313ea8aa8d6877281