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: 55eff0a3

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



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