[automerger skipped] Merge "Fix crash when incrementing data usage request"...

[automerger skipped] Merge "Fix crash when incrementing data usage request" am: 641d6d17 am: e3f5ddc9 -s ours am: e3d75ae7 -s ours am: 0e6166da -s ours

am skip reason: Merged-In Icee43a4ee913a6459a47632f608fa6cb8b2ed4c2 with SHA-1 6675e033 is already in history

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



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