Merge "Disabled sim is not enabled after sim hotswap" into tm-dev am: 9882dc97 am: 403271f8

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



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