[automerger skipped] DO NOT MERGE am: a36a45c -s ours

am skip reason: subject contains skip directive

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

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

Author: jhenninger