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