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: 24a820b3

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



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