Merge "Test plans for aosp_$arch and gsi_$arch on S" am: f0e243be6f am: d592b029a4 am: 2d503c58cc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5b010610a3d5b21f34ef0466a89e579a0614062