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

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/14018411

Change-Id: I7b85a4afa85242ed1fd47a7e47135dc08a7a86a4