Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11970057 Change-Id: Ib1852885513a3044bdc0cee05638719d2918d394