Merge changes I46a4b3ee,I01b0a6ab am: 3045fe697b

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

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