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

Change-Id: I1c71151d902a06d39ada5e5951b025c26367f1f5