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

Change-Id: Iae19ade154c0d584268a8b035ea0ed90ceb537b4