[automerger skipped] Merge TP1A.221105.002 to aosp-master - DO NOT MERGE am: 942368a1a0 -s ours

am skip reason: Merged-In I93ba6d21693175984da8de3aaccdcceea03318fe with SHA-1 414104a453 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/2294099

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