[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 27c07910ff am: 3877bc308d -s ours am: 62834ba828 -s ours

am skip reason: Change-Id I583836eeeaf604391ed9b1196d4b41e872dc635d with SHA-1 efc4c754ae is in history

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

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