Merge changes from topic "presubmit-am-2f502d40fb7c4790868f116278a68a44" into sc-qpr1-dev am: 02799a6dac

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

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