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 am: 0af79441

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



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