Merge changes from topic "am-8aeace8b72c7436cbfd4bccb1c951388" am: 1aca2e979e

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

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