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 am: 04897c34

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

Change-Id: Ie9f03fe161bb83389e2426123172a850b8afe94e