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