Merge "Revert "Remove unnecessary adbd permissions."" into oc-dev