Merge changes I833bff2a,I87c60690 am: 37f9b2888c

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

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