Patch crrev/c/5152885 am: e29ee6ae2a

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

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