[automerger skipped] Merge Android 12 am: 524458a8bc -s ours am: 68ee336461 -s ours

am skip reason: Merged-In I45a3fa76d6f66181705a1faf599e7f9839750a38 with SHA-1 7e2dfd92fd is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/1847659

Change-Id: I24cf79a989f10553f9013a935bea5b2c64016631