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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If457341fc43d0c1ea34145b6dba10e8a4e2174db