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

Change-Id: I719f81843fcf1c55ffc55d27669a5807da2cc167