Merge changes I833bff2a,I87c60690 am: 37f9b2888c am: 2c7e6b7298

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

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