Merge changes from topic "hidl2aidl_confirmationui" am: 1b7bec0011 am: f478c65436 am: 9e1549c860 am: a84af3a971

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

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