tree e79b779c6674fd3a4a633bb7c9db2bc6b82bd3cb
parent 6f233743450bb6440c67a9a2754fb4593a7d27dc
parent 679f3b2762bda451fdf374d0fcebc23c04f0cb18
author Jason Macnak <natsu@google.com> 1672956035 -0800
committer Jason Macnak <natsu@google.com> 1672956035 -0800

Merge remote-tracking branch 'aosp/master' into 'aosp/android11-gsi'

... to fix some CtsUiRenderingTestCases tests.

Note: some conflict resolution to avoid some newer AHB formats that
do not exist on this older branch.

Bug: b/258280541
Test: cts -m CtsGraphicsTestCases
Test: cts -m CtsUiRenderingTestCases
Test: cts -m CtsNativeHardwareTestCases
Change-Id: Iec57a5a5d9e28e4a2dcced8108c7a3f9555b3f62