[automerger skipped] Merge changes from topic "presubmit-am-ea0c585befe8408dbb84b9ee28ede2ac-tm-qpr-dev-tm-dev-sc-v2-dev-sc-dev" into sc-qpr1-dev am: 8ec39a69c3 -s ours am: 7b743ffc59 -s ours am: 21a94c36b1 -s ours am: 249b857914 -s ours

am skip reason: Merged-In I97522ce3607547c10025caa107cd1a40455a9c5d with SHA-1 5da4b70f5c is already in history

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

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