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

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

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