[automerger skipped] Merge changes from topic "am-95eed25fb4db416f8318ad03dc8574a1" into pie-cts-dev am: a59904cf9f -s ours am: fa9efba2af -s ours am: f4077e3c1a -s ours am: fadd74d1c1 -s ours am: 1f13362de8 -s ours am: b2c6558f17 -s ours

am skip reason: Merged-In I3e66348329829d15e399f3f0a0af97b690b78158 with SHA-1 ea80ae055d is already in history

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

Change-Id: I717926696d1e281ff7ee18dab71f7c3a3348a68c