Merge changes I833bff2a,I87c60690 am: 37f9b2888c am: 6a46db6b6c

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

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