Merge "Improve getModemActivityInfo API"