[automerger skipped] Merge "[SP29.1] Simplify logic of calculating and...

[automerger skipped] Merge "[SP29.1] Simplify logic of calculating and applying data limit" am: 6b9470ff am: 37dcb826 am: fc5e6ede -s ours am: 18d2238f -s ours

am skip reason: skip tag Change-Id I073934f3ac4d13b569ea3a295692c76451b7bbfa with SHA-1 5acc19c9 is already in history

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

Change-Id: I3a8ea7b2ac0b55f980bbce0703a8fb597fb228d6