Merge "Fix crash when incrementing data usage request" into tm-dev am:...

Merge "Fix crash when incrementing data usage request" into tm-dev am: 5b73f4be am: 00816b15 am: 62424636 am: cd10c2f3

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



Change-Id: Iaa18a1fcfb85c145b0d8bf62c32e662bd0889f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>