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

Change-Id: I92f3dc3aa1f3f110426965ec232e2a8b0b5f068b