Merge changes from topic "no-hard-code-apex-name" into main am: 0e57f94e6a

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

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