Merge "Expose ModemActivitiyInfo to system API" am: a8d67139d7 am: ade2fc12fc

Change-Id: I674da5ecf8493b366822ee92e575e47da1642539