Merge "Use CONFIG_CTRL_IFACE_AIDL instead of ANDROID" am: 98ce42b5de

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

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