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

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



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