Merge cherrypicks of [20290612] into sc-v2-platform-release. am: 7f33db0241

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

Change-Id: I24d12de1caf949fe8a529a9417268d1863f8435a
Signed-off-by: Automerger Merge Worker <[email protected]>