Merge "Verify mPollThread is joinable before detaching" into android10-tests-dev