Merge "Refactor accessibility button support detection" into oc-dev am: 337e2aae53
am: 7a0de65bee  -s ours

Change-Id: I9c6363327716aa3c1ef3f85abb7f8fdd997f7c01