Merge "wifi: Two AP instances use the same interface name" am: 2888bf2e24

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19873289

Change-Id: I9b29085964ec4a1626f1c9114b8f583820e5b0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>