[automerger skipped] Merge history of CTS am: 6a41dd4d8e -s ours am: 8ed398fd4d -s ours
am skip reason: Change-Id I30d52c4df571c894b7797300e8f56ddd4b2cc2dd with SHA-1 35cd54f7a0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13014426
Change-Id: Ief643822d5aa428aa7e8f08be0bc72340a81cea0
This commit is contained in: