Merge "Merge "Ensure that adbd is stopped explicitly before re-enabling it"...
Merge "Merge "Ensure that adbd is stopped explicitly before re-enabling it" into rvc-dev am: 18da7ba0 am: 13b2a506" into rvc-d1-dev-plus-aosp am: c87a00c1
Change-Id: I550e137d7353c29ce928326f21c2402a32cdfc97