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

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

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

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

Change-Id: I9558e4de1389dc20ff51727943d472453ddc4512