[automerger skipped] Merge "Expose ModemActivitiyInfo to system API" am: a8d67139d7 am: ade2fc12fc am: 10ab79857e -s ours
am skip reason: Change-Id I1311736efceaf6b78b2a5d3350caaefd7c520413 with SHA-1 d78231ed07 is in history

Change-Id: Ia4d71160e8a85714a088bc40e86f94f7a41bda09