Merge "Fix accessibility services tests to work with atest"