Merge "Revert "adbd: lessen security constraints when the device is unlocked"" into oc-mr1-dev