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

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

Change-Id: Ib41c238ab44b6bd3b32b4a0937b9455d563b5def