Merge changes I7414c278,I11c7ea70 am: 778c9c9f52

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

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