Merge "Fixed that data throttling was not properly enforced" into sc-dev am:...

Merge "Fixed that data throttling was not properly enforced" into sc-dev am: 07a97ead am: 233cc420 am: c321ecb9

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

Change-Id: I34fb489ad1ca8013e633624b5cef1ca5e4091ef0