Merge changes from topic "hidl2aidl_confirmationui" am: 1b7bec00

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



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