Merge "Update usages of ModemActivityInfo"