Merge "Use CONFIG_CTRL_IFACE_AIDL instead of ANDROID" am: 98ce42b5de am: 9817f48858 am: 3b73fb47bd

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

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