[automerger skipped] Always allow agent attach on userdebug builds with kArtTiVersion am: 90f8addf -s ours am: fa67cf55 -s ours Change-Id: I28a6df811199378e45e7eccb97be21c6bcdbcfd1