Merge "Fixed inactive SIM removal not updated issue" into udc-dev am: ba80e0a3 am: 8aa45280

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



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