Merge "Return empty ModemActivityInfo in error case instead of null." into mm-wireless-dev