Merge changes from topic "hidl2aidl_confirmationui" am: 1b7bec00 am:...

Merge changes from topic "hidl2aidl_confirmationui" am: 1b7bec00 am: f478c654 am: 9e1549c8 am: a84af3a9 am: dc22a4a4

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



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