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

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

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