Merge "Correctly apply subId changes in ImsServiceController when SIMs change"...

Merge "Correctly apply subId changes in ImsServiceController when SIMs change" into tm-dev am: c3cde513 am: e31f5c7f am: 7f6e66eb

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



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