Merge changes I5ffa2faf,Id5f14d6e am: b6ac308b50

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

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