Merge changes I99d494d3,I208ceceb am: b5ebe944b5 am: 075c6f743e

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

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