Merge "Update ScanSettings documentation for scan modes" am: 8157ab2a0e
am: be7ccdf6e9

Change-Id: Ib66ed6d6d6e9e1766fa4ed495d3d045b8a6384fe