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
Change-Id: I86c9feebfd58686d68b96df2a73eb546cdb73ff0