[automerger skipped] Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70
am: 4af7d6a7d2
am: d51ee68578
am: 9146943bb5
-s ours
am skip reason: Change-Id I7ebae37373d53fb2c59b6b546232dbddf77398d4 with SHA-1 d67a1c3d8e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180
Change-Id: If14ba0fec1643ab4538f7d008e030ccb53453a44
This commit is contained in: