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

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



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