Merge "Change UI to be consistency with dialer settings light M2 theme" am: 21a04a3d9d am: 74d8218af4
am: ed558f7875

Change-Id: Iaab0b4a02089d4835d8ba763bdeda562d4801ba7