[automerger skipped] Merge changes from topic "cherrypicker-L42900000961040401:N31900001374826989" into udc-dev am: 9e920c73fa -s ours

am skip reason: Merged-In Ib7a290ea0ea8e552c71c657696397e8114fcee52 with SHA-1 86f674187f is already in history

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

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