Merge "[SP29.1] Simplify logic of calculating and applying data limit" am: 6b9470ffc4 am: 37dcb82631

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652211

Change-Id: I73805c127c9a20de1e502ccedfd65195c76a6b6a