Merge changes I19ae1a9f,I608dff3b into udc-dev am: 250dbc133c

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

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