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

Change-Id: I37fb992be70a7c2525de69f3834cbc5e04f21200