Merge "Revise Accessibility button chooser intent/permissions" into oc-dev am: ecb5b5ccc3
am: bc411cd461

Change-Id: I0a085365593d05a77eab013259c2a36ce2c39f1a