tree ffb9d1b3619ac7db5997d02fec7904d56351397e
parent 9af95118f46b4041ab8ad563dc17f0eacefca2b4
parent 5d26d52daf9edfc75edfc530008e6a26b8074e83
author TreeHugger Robot <treehugger-gerrit@google.com> 1599107783 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599107783 +0000

[automerger skipped] Merge "Specify CAPABILITY_INTERNET for ConnDiags CTS test." into stage-aosp-rvc-ts-dev am: f1383c3543 am: 8c00266fb6 am: cefaa4fbbc -s ours am: 1f086c646a -s ours am: 5d26d52daf -s ours

am skip reason: Change-Id Ia32ac00f949a2ee9319c80c25f294bfa834ad0f9 with SHA-1 cb00911ada is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12501101

Change-Id: Ieddba492bb8f400c6991b66d1a71a02267681c5e