Merge changes I09e780af,I21367c66 am: 94a4149a8f am: 52c99601f6

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

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