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: 4b2d2d45

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

Change-Id: Ia4082f62234d29f80720ed44a782e0cdbe25bbc6