Merge changes from topic "concurrent-keyguard" into udc-dev am: cc5495e9 am:...

Merge changes from topic "concurrent-keyguard" into udc-dev am: cc5495e9 am: fae00030 am: c2922b0b

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



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