Merge "Make ApexTest::isGSI() return true on automotive" am: c86d3261db am: 30561cc5d0 am: 4516287f6c

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

Change-Id: If25e65d3a9d7e4b047506d26d056c32a41a157e3