tree ab3f9d73112fe3ad4dcec228a84c1dbd105a9c55
parent 7df146e3d542fd952a39a3be7a6e70eb1be181d9
parent 667aeac1619125ded828b91d14622a0a49324949
author Baligh Uddin <baligh@google.com> 1604887892 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604887892 +0000

[automerger skipped] Merge "Merge history of CTS" into stage-aosp-master am: 667aeac161 -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/+/12984379

Change-Id: I2070e10640ccdb27fe5dbcafa030fe3c5015ade4