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

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

Change-Id: I3ffec60df44cb78f1f8334535f4a3d7d9b5715c9