Merge "Directly update the udfps icon background color" into udc-dev am: e12deb3a am: fa3cae0b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22317502



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