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

Change-Id: Ife980c83b5424d7549eac2cebc047f1628507a14