Merge "Refactor accessibility button support detection" into oc-dev
am: 337e2aae53

Change-Id: I4f96a5ae3e847b2439d017b34038a4b7b07965fa