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

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

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



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