Merge "Checking 'phoneId' when sim status is changed" am: c5770ff7 am:...

Merge "Checking 'phoneId' when sim status is changed" am: c5770ff7 am: 680eea85 am: 32a05414 am: 10d5af34 am: 7e125e20

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



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