[automerger skipped] Merge "mainline: remove CarrierConfigManager.init" am: eff795f061
am: 6a4d09c4ed
-s ours am: d35e25c295
-s ours am: fe652a5641
-s ours am: 2d0b2a0c3f
-s ours
am skip reason: Change-Id I2a72d409574fc281e5de57d58a27551dd040d551 with SHA-1 762e193266
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387120
Change-Id: I75693bfcd6579fccb6d11041b152cd3c7eeb23ac
This commit is contained in: