[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: a0ad1c6b11 am: 6e5c861b5b -s ours am: e4cfdfc48e -s ours am: b21b590af0 -s ours am: 967a3e3205 -s ours

am skip reason: subject contains skip directive

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

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