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