[automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 1b45df1033 -s ours am: a7e913dbef -s ours

am skip reason: Merged-In I3a6ce5be91df1d3548c49eb28046ee10ae4e33c7 with SHA-1 6148344ddb is already in history

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

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