Merge changes Ie84b8777,I90148d83,If85f8a12,Id8932aaa,I7e2c800b, ... am: ef017fc42b

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

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