Merge "Revert "adbd: lessen security constraints when the device is unlocked"" am: 9638729a9d
am: 08a8c4209f

Change-Id: I22a007674b17d7bb1d23ddd49d73ba3a918cfe33