Merge changes I4994dd8d,I98c1aab4 am: 472d51344c am: fccaf1b299

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

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