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

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

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