Merge mainline-release 6664920 to master - DO NOT MERGE am: 27c07910ff

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

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