Merge changes I12a07ba3,I308763fa am: f4c0a5a84b

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

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