[automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b
am: 5c21396034
-s ours am: ce259b61f6
-s ours am: bdd022172e
-s ours
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398389
Change-Id: I0d8fcdf66e7c9d664c75525cce723e4f83d15bc5
This commit is contained in: