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

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



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