tree ac6ab184267e1789471db8593c952b56f1d4fe14
parent 5d5df3f2443ed6d71a51ee4759b59b3037d9e436
parent 4ff145ff3f59bf82a2286f5d1b723c46f4641476
author Treehugger Robot <treehugger-gerrit@google.com> 1607956796 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607956796 +0000

Merge "Avoid including cts-system-all.api as a test module." am: 288631d4ad am: 4ff145ff3f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied09c17edcc05eb0f6c210c1a88d56ebc7fbe3c4