Merge history of ConnectivityT am: 31bb94f3bc

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

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