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

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



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