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