[automerger skipped] Simplified data network controller callback am:...

[automerger skipped] Simplified data network controller callback am: bf0dd4d1 am: 9c69bfc1 am: 1a1cb80b -s ours am: 5e300ebf -s ours

am skip reason: Merged-In I779b389f15e46bd3f27bcee2adf0bcb48654a3ca with SHA-1 1024f9c9 is already in history

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

Change-Id: I16e8c667df2da189dd6c613d24b1c6870aa0f5ec