Merge cherrypicks of [20290614] into sc-platform-release. am: 80385e3c2d

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

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