Merge "AdapterServiceTest: Wait for ScanMode Broadcast"