Merge "Explicitly set a user for the wpa_supplicant service" into main am: 05c525178d am: 93b42145a9

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

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