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

Change-Id: I50095569e104c62c672065097290b93d7f0d78bf