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

Change-Id: I2c50e01eabb7e1ab463da13209ba98cc5127969b