Merge "Revert "adbd: lessen security constraints when the device is unlocked"" into oc-mr1-dev am: 7e929121b1  -s ours
am: 2743cf88e8  -s ours

Change-Id: Ib371af082eac232a9e2c2f616572f75f903cf87d