Patch crrev/c/5152885 am: e29ee6ae2a am: 6fe473689e

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

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