Merge "Modify theme to DialerSettingsLight am: 2804b1139b am: 7e61070b1d am: 3f3aee480e" into rvc-d1-dev-plus-aosp