Merge changes I7414c278,I11c7ea70 am: 778c9c9f52 am: a53d3cf318

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

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