[automerger skipped] Add Aidl changes to support enable/disable CONFIG_CTRL_IFACE_AIDL flag am: a2e6c5066c am: ccc978b53e -s ours

am skip reason: Merged-In If88de5d3d9302d97b7236ce9aa321f8337312cc8 with SHA-1 c58b609e59 is already in history

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

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