Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev