Merge "Ensure that adbd is stopped explicitly before re-enabling it" into...
Merge "Ensure that adbd is stopped explicitly before re-enabling it" into rvc-dev am: 18da7ba0 am: 13b2a506 am: 6338726b
Change-Id: I2f4adc95021048ba2d18f09248d2ac8651af7fa0