[automerger skipped] Merge "Fix in Modem Activity Info updates" into pi-dev am: 1231b7016e
am: 1d0c25962f  -s ours

Change-Id: I3b28a99183b1273a3c8c83177724df5b56d0e249