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

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

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