Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: a0ad1c6b11

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

Change-Id: I76c63b911db507ae2c2aed938235b41c0719d906
tree: 9d0962be0393f60c890bf4e5cec1725db270db42
  1. tests/