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

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

Change-Id: I42bb76436824188b53788fb2385354b23bdfd6df