[automerger skipped] Merge "Smear ModemActivityInfo across multiple stats"...

[automerger skipped] Merge "Smear ModemActivityInfo across multiple stats" into tm-dev am: 3f530355 am: f2d66cfc -s ours

am skip reason: skipped by user mwachens

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

Change-Id: Ic559e0239fc969d927f0c272ba334190d5ddb752