Merge changes I8e806b3b,I5e8e4673,Id2a078da am: 826bdb3ec4

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

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