Merge changes I69128db9,I13db22f8 am: aa15a8ea5d am: 5b2e3f4c13 am: c884289232

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

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