Merge changes from topic "am-87b03182562a4aeca1d7134b28abe4ab" into android10-tests-dev am: 8e9c30ca5b

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

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