Merge "Disabled sim is not enabled after sim hotswap" into tm-dev am:...

Merge "Disabled sim is not enabled after sim hotswap" into tm-dev am: 9882dc97 am: 27f3ef2b am: 2254a525

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



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