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

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



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