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

am skip reason: skipped by user mwachens

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

Change-Id: I995402363c45f386a5f609d93180b934eb3cb3e4