Merge changes I650f354c,Ia7184e9b am: 4f6c020dbb

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

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