[automerger skipped] Merge "[TelephonyMainline] @hide system api since we'll...

[automerger skipped] Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - DataAllowed" into rvc-dev am: 365dfedd am: ea27babb am: af1240ec am: 4758c521 -s ours

am skip reason: Change-Id I62a0249a1462c9e8d71552e2304642eb6bde3eb5 with SHA-1 8a7e3d68 is in history

Change-Id: I0e61e660037ed570b4d62816b723e056b235ef00