[automerger skipped] Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef
am: f257197d96
-s ours am: 009f7ec40d
-s ours am: e1d58f6977
-s ours
am skip reason: Change-Id I6d7e72a656723c0620d579e1e223945e2a3588af with SHA-1 e30517f9a5
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390058
Change-Id: I486c5f5becc1e4c624f1c74a17dccd5eb2fe490c
This commit is contained in: