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

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

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