[automerger skipped] Merge "Update unthrottleApn calls to take in DataProfile"...

[automerger skipped] Merge "Update unthrottleApn calls to take in DataProfile" am: fa2dc0b7 am: cfa8c4b3 am: 9658f8d1 am: a9587ca7 -s ours

am skip reason: Merged-In I4e77e56296d6a9a8b1010167e260f4e9c1a40202 with SHA-1 23bff980 is already in history

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

Change-Id: Icd8a8acde61ab731570adf7e6892cfb016a5a674