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 am: 7a9c9724
Change-Id: Ie334256757cd0bef3d000db40d5c037f6a9b086d