Merge changes I2e05b016,I8ff36f37,I302bbe8d am: 0b5879e17d am: 1e092386f4 am: d9132fa196

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

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