Merge changes from topic "presubmit-am-c1285a72c3ee4cb0999ec4c5d0944c30-tm-dev-sc-dev" into sc-mainline-prod am: e33759d942

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

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