Merge "Grant shell permission to manage accessibility" am: cf092a87c2
am: a28031b7da

Change-Id: I690233f012873d333f4ed4931f29e9c27223ab8f