Merge remote-tracking branch 'aosp/master' into goldfish-opengl-update

This updates goldfish-opengl.

BUG=251519884
TEST=launch CF

Conflicts:
	system/hwc3/DrmPresenter.cpp
	system/hwc3/DrmPresenter.h

Change-Id: I8578497fa77934d542909f92b414adca558d1c69