Merge changes from topic "am-36eb97415e3d42bf94ee8b3737838024" into android10-tests-dev am: fa1cbe3d98

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

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