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

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

Change-Id: Id8bf958ab72dec185882d5944bd822ec20cc4f3b