[automerger skipped] Merge Android U (ab/10368041) am: 7c1aef556d -s ours am: ceb4aa15b4 -s ours am: 5511da9fa3 -s ours am: 877345971e -s ours

am skip reason: Merged-In I04e605d8a5d899336bc6dd335bc344ffd55c69f0 with SHA-1 d23e45c307 is already in history

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

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