Merge "Add a flag to indicate if a ScanData is for a scan for all channels" am: c7b84e6d0d am: d8a5904abe
am: cb38f6fbb8

Change-Id: Ib1bfd6d4a06548351c8215cc995dee7f6de2862c