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

Change-Id: Id55f90417710fc44c439eabb6dd8dd573c748b35