Merge "wifi: Handle removeAccessPoint for bridged AP case" into sc-dev