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