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

Change-Id: I8c874c282db93dbb531c9c7e27540044c446144e