Merge cherrypicks of [19217852, 19693696, 20035263] into sc-v2-platform-release. am: 96b30060a6

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

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