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