[automerger skipped] Merge "Migrated MultiSimSettingController" am: 44102a40...

[automerger skipped] Merge "Migrated MultiSimSettingController" am: 44102a40 am: d6d15db7 am: 6998a66f -s ours am: 24302e3a -s ours am: f75e78d0 -s ours

am skip reason: Merged-In Ibadbf98093a5444f9942ad51384d611c99de15a3 with SHA-1 7089c962 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2471165



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