Merge "Fix low contrast on work challenge screen emergency call button" into...

Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a am: c83e4014

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



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