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

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

Change-Id: Ie077e9344caf01652c00478173b7859156350ace