Merge "Add a flag to indicate if a ScanData is for a scan for all channels" into nyc-mr1-dev
am: 13d5e3b7fe

Change-Id: I7c3ace79b0b4cda904d9cd70a90b7fa912c3536f