[automerger skipped] Merge "Fix the problem that the SIM status and IMEI after...

[automerger skipped] Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev am: 2ea54cc1 am: 81725203 am: ca1aa913 -s ours

am skip reason: Merged-In I2de7ee72fc1315eeef01288b386f8756ca366e33 with SHA-1 9c63c415 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270337

Change-Id: I7716682eb2dc407a8e099e1920ccfcbd69e124a9