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: cd2b16a7

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

Change-Id: I0f17ffded6f67a5fd6e4f1aab40fe0b9d372400c