Merge changes Id9799762,I9d749393 into main am: 70896174e2 am: 476a670b44

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

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