Merge "Merge "Update ScanSettings documentation for scan modes" am: 8157ab2a0e am: be7ccdf6e9 am: 4b0748ffda" into oc-mr1-dev-plus-aosp