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