Merge changes from topic "cherrypicker-L07800000960236296:N91900001362511543" into udc-dev am: 4c54767e14

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

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