Merge "Add a timeout for unregistering a DAP" into android10-tests-dev