Merge "If device isn't on the keyguard, always use sfps blue colors" into...

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

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



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