Merge "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" into android12-tests-dev