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