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

Change-Id: Iad0770cdba814c1c1f03263a77ba4ad77a198c4f