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

Change-Id: I6dc234faf5560d869b0281a0eb64ae5a1a553459