Merge "adbd: lessen security constraints when the device is unlocked" am: e03665142e
am: 0fe0ced23c

Change-Id: I5998cf88d64184df463d5b363efd6af618c19674