Merge "Merge "Grant shell permission to manage accessibility" am: cf092a87 am: a28031b7 am: 2ca26297"