Merge changes Ic18521b6,Ibede8137 am: a1b3378285

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

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