Merge "Merge "Merge "EncodeVirtualDisplayTest: avoid dangling reference to virtual display" into pie-cts-dev am: 29617ded5b" into android10-tests-dev am: 6d9172b2f7" into android11-tests-dev am: 4885dcfa94

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

Change-Id: Ia3ed1bff3c5dd5ba5d14f6ad34cbe8ab78a4b601