Merge "Fix colors in bubble settings so they're more visible" into udc-dev am:...

Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a478993 am: 7605e122

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



Change-Id: I616264cebad588f95f8c1756e81bca62927ddbb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>