Merge "Revert^2 "Make adbconnection start automatically for debuggable apps (on target)"" am: 204078a2 am: 0e4ded34 am: ef0858ad Change-Id: I51b19d0809ae12d04fb685ea68dd87993e373214