DO NOT MERGE am: 0ef67d90c2

Original change: https://android-review.googlesource.com/c/platform/cts/+/2400164

Change-Id: I8d13c78e1b3c84ca3dcfaafba39545b73c1c4816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>