[automerger skipped] Merge "Migrated MultiSimSettingController" am: 44102a405a am: d6d15db75e am: 6998a66f74 -s ours
am skip reason: Merged-In Ibadbf98093a5444f9942ad51384d611c99de15a3 with SHA-1 7089c96209 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2471165
Change-Id: I1941c3d51a1991e0210f659ea28943a2956e60dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: