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