[automerger skipped] Added data setup/handover throttling support am:...

[automerger skipped] Added data setup/handover throttling support am: 62b3190c am: f74afe50 am: e6441951 -s ours

am skip reason: Merged-In I08c26894b8dffbd7de2b818811a0a1068e4b4e81 with SHA-1 17e2fc16 is already in history

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

Change-Id: I5b95772794bb652376d59028b45afc476b9fc944