Merge changes I4994dd8d,I98c1aab4 am: 472d51344c

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

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