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: 9c756334" into rvc-d1-dev-plus-aosp am: 6aaa9761
Change-Id: Ie1ddc6eac28c861f2ac310375ba07f11149521ed