Merge "Remove unused method removeAllQosPoliciesForScs from the Wifi framework." into udc-dev