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

Change-Id: I7f3a015c5836c4b1f3a7a504f24aa4ada801bc4e