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