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

Change-Id: If57f5a7bc452a87aad4084f83cdd189c37f5a780