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

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

Change-Id: I718c2c85b5c4bd15691165586fd3429f17f4a487