Merge "Make isAccessibilityButtonSupported public" into oc-mr1-dev am: 8e74686fb4
am: 58770c5759

Change-Id: I65262bf2903b72d60bb4d9cef5be145d8f1f0acd