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: e8642adc am: f6c9abef am: 9bec8bb6

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



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