[automerger skipped] Merge "[Telephony] Implement onDataEnabled callback" am:...

[automerger skipped] Merge "[Telephony] Implement onDataEnabled callback" am: c8057ecd am: ce049176 am: 4d942da6 -s ours am: 6794dbe2 -s ours

am skip reason: Change-Id I1b9fe50e4b805f5117fb6e03438dd0a09fbcfebc with SHA-1 4ad5f0a7 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608055

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2fb9d75ed4e8572f66d05da1cac34d17c579088