Merge "Add special exception to ignore certain EAP failures on Pre T devices" into udc-dev