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

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



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