Merge "If device isn't on the keyguard, always use sfps blue colors" into udc-dev am: ee3ec01f81

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

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