Merge "Keystore 2.0: Add watch points to async_task.rs" am: 8de5b6f65b am: 6ee5fae089

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

Change-Id: Ieaaf7df56376179db955ce6c7477fa169ae8ed97