[automerger skipped] Merge "Update and expose ModemActivityInfo" am: c892758881 -s ours am: 23564782a0 -s ours

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

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

Change-Id: I7d039da421dbd010dcd0f098a9b42d027bec4d78