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

am skip reason: subject contains skip directive

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

Change-Id: I1bbe7b1ba9dc6c58bb36f37b18e18b238974e73b
tree: fe3755b967ef1c5a403f2d0449a705e5b29856a4
  1. tests/