[automerger skipped] Merge "Merge "Replace TelephonyManager methods for mobile...

[automerger skipped] Merge "Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec" into stage-aosp-master am: bab12d1a -s ours

am skip reason: Change-Id I7ebae37373d53fb2c59b6b546232dbddf77398d4 with SHA-1 17ba8166 is in history

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

Change-Id: I6803f4fbde2b7ae9f6635ce4040f4d085900b56f