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

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

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