Merge "Add test config for adbd_test and apply MainlineTestModuleController to...
Merge "Add test config for adbd_test and apply MainlineTestModuleController to it" into rvc-dev am: 89506246 am: 5b59f27e
Change-Id: I6097d35ae7172a8a7b9958f0df038d1d9b4306e8