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

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



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