Merge "Change UI styles to match dialer settings light M2 theme" am: 4bda91f1d4
am: 084c03053c

Change-Id: Icd22bf71c85c302ae400a726412766685e4fe40b