Merge "Revert "Fix accessibility CTS tests."" into lmp-dev