Merge changes from topic "presubmit-am-bfa08d822822481caf28d8e4e8b6feab" into sc-qpr1-dev am: fd3457de32 am: d3be54b9b7 am: 0f3b43dfe7

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

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