[automerger skipped] Merge "NetworkStats: Avoid Division By 0" into...

[automerger skipped] Merge "NetworkStats: Avoid Division By 0" into sc-qpr1-dev am: c98d5a9d -s ours am: 42103152 -s ours

am skip reason: Merged-In I4e5ac9da7adf707d7f991483555ab5c6d0cc3245 with SHA-1 aeaa9cf5 is already in history

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

Change-Id: I5cdcb23913f62ed43cee2055b01779c31a945625