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: 466c534e am: 24a2b98c am: 02953ecd
Change-Id: Ibe9443d6f46adbf7890f07f6f50ca888c30019ce