Merge "Expose ModemActivitiyInfo to system API" am: 5910f6dd65 am: 340397814a

Change-Id: I5ec18c82caa066e2aced3432756cd0811ff4a9cb