Merge "Return false when tetherOffloadRuleAdd doesn't really add items" into main