Merge branch 'aosp/upstream-main' into 'aosp/main'

... to pull in https://crrev.com/c/3563512 to avoid trying to use
dmabuf heap allocator when dmabuf system heap is not available.

Bug: b/227375257
Test: cvd start
Test: vts -m VtsHalGraphicsMapperV4_0Target
Change-Id: I2de7d0b8e6a898fa34333ade9204929342268659