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

Change-Id: Ib3ea21d8216c1cc05f00b3b9ddef5f7a908f22df