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: e83b7b92 am: 44c6ab74

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



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