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

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



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