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

Change-Id: I6611368010a2cad55acbbb43fd4b6de12235f83c