Merge "Add all CTS tests to general-tests suite" am: 28b5564126 am: b6a955df5b am: ebdd0f441e am: f5920c86d5

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

Change-Id: If87c0a566ad4e622cb3b7b4ddfe4a08338a4111d