Merge changes I71988117,Ia70379a3 am: 31b48fa787

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

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