Merge "Revert^2 "Make adbconnection start automatically for debuggable apps (on target)""
am: 204078a26a

Change-Id: I1b38b5c20227851e5a6ba342086e19513cf2d7bf