Merge "Add separate permission and group for access to the MTP USB driver" into honeycomb