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: 8f8ddb1e

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



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