[automerger skipped] Merge "Update usages of ModemActivityInfo" am: 939036c946 -s ours

am skip reason: Merged-In Ida52b818444870c6bd582ed2b3e5d2b768338c70 with SHA-1 49656c01df is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1820512

Change-Id: I10ada81bbc62a4c45527c6e331f115a4346b126e