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: Idc3974960db8d11581c21960f3a1837debed910e