Merge changes I71988117,Ia70379a3 am: 31b48fa787

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

Change-Id: I0ef3de1e58bc836545c597b08a9c06ce34b351d8
Signed-off-by: Automerger Merge Worker <[email protected]>