[automerger skipped] Merge "Update and expose ModemActivityInfo" am:...

[automerger skipped] Merge "Update and expose ModemActivityInfo" am: c8927588 -s ours am: 23564782 -s ours am: 6b4d991e -s ours

am skip reason: Merged-In I762ed949342861c75d94eafce88335e7bd8c9139 with SHA-1 0eca33ec is already in history

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

Change-Id: Id72afdbb2e8da8cbc817735a5abcdec54919c5dd