[automerger skipped] Merge "[Telephony] Implement onDataEnabled callback" am: c8057ecd1c am: ce04917626 am: 4d942da6f9 -s ours
am skip reason: Change-Id I1b9fe50e4b805f5117fb6e03438dd0a09fbcfebc with SHA-1 4ad5f0a7c7 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608055
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I04a1b91748fa0fd6669d5f1b6abcfcda0c5e9bfb
This commit is contained in: