[automerger skipped] Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev am: 2ea54cc143 am: 8f5c440f4b am: 2ffb606759 -s ours

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

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

Change-Id: I8167fd9a1b68abb651ebcb58b10df81185dbcd75