[automerger skipped] Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev am: 2ea54cc143
am: cf87fb2ae6
-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: I0bac81aa47893b9445062789d0a3a65c422b703f
This commit is contained in: