[automerger skipped] Merge "[Telephony] Notify onDataEnabled" am: 2ae5e682...

[automerger skipped] Merge "[Telephony] Notify onDataEnabled" am: 2ae5e682 am: c49f402e am: 6af0f0b7 -s ours am: e9edb011 -s ours

am skip reason: Change-Id I3e22ccce2317b6e1ab053a76ae1467b335d42058 with SHA-1 02307b89 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1608054

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12600b97a5cc1d1c119448028c4c02631c2805fe