[automerger skipped] Merge "Expose ModemActivitiyInfo to system API" am: 5910f6dd65 am: 340397814a am: 7fabca1b35 -s ours
am skip reason: Change-Id I6e1b0daa2e0ce23b9fd55f0dd7037631b93eb7a5 with SHA-1 7322e4a7ce is in history

Change-Id: Ie7d0c39d82d2715ac078a2df4f8aaa8b7f785268