tree f3918f24b49efd8ee627e0abe4e1d78878491896
parent 132bd8508a6357b3a7ec349067ce07c1f29de187
parent e6676b70172a1c32fe97dc1b218af5de90561a52
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1645032907 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645032907 +0000

Merge cherrypicks of [16822123] into sc-v2-release. am: e6676b7017

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

Change-Id: I99be902059e6f7c4674e7d7ed5a1a5a2be6a542f