Merge "Ignore keepalive tests before S and without Tethering module" into udc-dev