Merge "Keystore 2.0: Reinstate the default busy handler." am: 2bd70bf11f am: ec7353f01d

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1702826

Change-Id: Ie789537332d7367b4465e6ad78d6e37c073d67ba