Merge "Fix tests with nonpublic setup methods" into qt-dev am: 805a51808f am: 4142a40585 am: 612507de10 am: 77e17d0823 am: 28c10db62b

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

Change-Id: I64972faca9cd173ea08be150b3a5d863f60e95c7