Merge cherrypicks of ['googleplex-android-review.googlesource.com/23638114', 'googleplex-android-review.googlesource.com/23879744'] into udc-release. am: e47aaa5d3e

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

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