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 am: 03a2f11b am: d9685a18
Change-Id: Ia35906fca7a3a636b74d9a5de5a2943cf55e659a