Merge cherrypicks of [20294383] into rvc-platform-release. am: 0d9bd3c74b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20456108

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