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

Change-Id: Ie43c9becc020a48f194f6b94e52b77c1dc1d139a