[automerger skipped] Merge "Migrated MultiSimSettingController" am: 5e840c73...

[automerger skipped] Merge "Migrated MultiSimSettingController" am: 5e840c73 am: 6c2bf85f am: 4925e80e -s ours am: c9cf3b97 -s ours am: c4383cbd -s ours

am skip reason: Merged-In I36e7782368f5ea1ae57fbbb805f98292714abe58 with SHA-1 cfebd929 is already in history

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



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