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

[automerger skipped] Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - DataAllowed" am: 1724914c am: 42f97035 -s ours am: efddc855 -s ours am: 597070f8 -s ours am: 14286259 -s ours

am skip reason: Change-Id I62a0249a1462c9e8d71552e2304642eb6bde3eb5 with SHA-1 7c626cb8 is in history

Change-Id: I59d29a27a239312f6a12a5a4621b09a40b4dbcb9