Merge "Deprecate BSSID Hostlist system API" into oc-dev
am: 5fc916d852

Change-Id: I8b4b1b2b90e8d141b416adbc53c3e10ba64c2a86