Merge "ConfirmationUI AIDL VTS tests fix." am: 6590063e99 am: 7ae04c06c3

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2240285

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