Bug: 295237486
Test: atest AdapterServiceTest
Test: atest AdapterServiceRestartTest
Test: atest AdapterServiceFactoryResetTest
Test: atest AdapterPropertiesTest
Change-Id: I78ddb76dabb2ccc5ee518ae40139de055e8c8ebd