Merge changes I2e05b016,I8ff36f37,I302bbe8d am: 0b5879e17d am: 3effe757d8

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

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