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: 1835c3ea am: c1e97cf1 am: 0bf7d30d

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



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