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

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



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