Merge "Temporary workaround for plug-in chips on the lockscreen" into udc-dev...

Merge "Temporary workaround for plug-in chips on the lockscreen" into udc-dev am: 1e5933c1 am: 80a266c2

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



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