Merge changes I5ffa2faf,Id5f14d6e am: b6ac308b50 am: ba33b34c61

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

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