Merge "Fix crash when incrementing data usage request" into tm-dev am: 5b73f4be am: e8642adc

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



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