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

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

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