Original change: https://android-review.googlesource.com/c/platform/cts/+/1326394 Change-Id: I66f85a4ef7f6f2146af5084ab7366532d69cad5a