Merge changes I12916061,I410f0532,I90b6f7f1 am: 41df7f99bb

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

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