Merge "If device isn't on the keyguard, always use sfps blue colors" into udc-dev am: ee3ec01f am: 93e3a15d am: 4cdb6139

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



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