Merge changes I41ae1d61,I334860af am: 794d04d779

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

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