Merge changes from topic "cherrypicker-L37600000962443954:N56900001394685860" into udc-mainline-prod am: 631e843b8d

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

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