Merge "Fix accessibility button CTS test" into oc-dev
am: 921384157d

Change-Id: Ie1770cf5803e595ac5bf085028ace1879a661499