Merge "UiccSlot: Validate hotswap restart prompt component properly" am:...

Merge "UiccSlot: Validate hotswap restart prompt component properly" am: 8f565e31 am: 8ca27d3a am: 369820e2 am: 938da806

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2045387



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