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

Change-Id: I7f641be89ae60d1afe54ffb86611a421ffa3a8d5