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

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

Change-Id: I426e44eee0676b63f64153d48e0fdaf801ff2742