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