[automerger skipped] Merge "Fix in Modem Activity Info updates" am: 119ae5d250  -s ours
am: b7e5315d23  -s ours

Change-Id: I64e8a8165f58982281929349ecf237d8213f3d2d