Merge remote-tracking branch 'aosp/upstream-main' into HEAD

Merge in changes from upstream freedesktop/main branch

Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: If8819bf56b4b2e513139b4227178b8776be588c0