Merge cherrypicks of ['googleplex-android-review.googlesource.com/24154352'] into udc-release. am: 82d2b85442

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

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