[automerger skipped] Prevent re-startAdbLogcat am: 3c21fe84c5 am: 4e10af67b8  -s ours am: 03aa79caff  -s ours
am: d48fa47d4f  -s ours

Change-Id: I619a21b9e5a39800055b6ee7d2568ef5ed2f1d1c