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