Merge changes I650f354c,Ia7184e9b am: 4f6c020dbb am: 9d0de9db48

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

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