[automerger skipped] Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev am: f0a3348ceb
am: 9a7f3aaf0e
-s ours
am skip reason: Merged-In I163ab8e966de57ddff7939a46fc47b05bea029e3 with SHA-1 f0575366c4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262279
Change-Id: I93656395e0b051dd536c5bbf5f268e4de82c3cf7
This commit is contained in: