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

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

Change-Id: Iefc2290cd5ab159db676c03dfa2d0dc22e943f0d