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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0db913e64e0ceb4f6e0fd8ddc97776953a9cf31