Merge "Merge "Update ScanSettings documentation for scan modes" am: 8157ab2a am: be7ccdf6 am: 4b0748ff" into oc-mr1-dev-plus-aosp