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: I8f42b4084ab83a00f61b3cd82349ce371cd8b7b5