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

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

Change-Id: Ifd22f79bf52b43cf7f5921f45a11ac5f8c930cc8