Merge "AdapterServiceTest: Wait for ScanMode Broadcast"
am: 41b500c4c9

Change-Id: I239710b10af92a128d789b82b6534c6c551c5b87