Merge ""Revert^4 "Make adbconnection start automatically for debuggable apps (on target)""
am: a316f9129a

Change-Id: Ibcb82806f2de55ef82e03dc977a999dfbe09cf5f