Merge "Reset AAID connection on TRANSACTION_FAILED" into main am: 7a22939220 am: a5222aed5e

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

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