Merge "Fix GAR color constrast issue on dialog" into sc-dev am: 6ee9ceab77

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772168

Change-Id: If58b3ae67762d39d4da7f35d57ddd9e762d8eb05