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

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

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