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