Merge remote-tracking branch 'aosp/upstream-main' am: 954ed95e64 am: 6621e1e2bf am: a922a6432e

Original change: https://android-review.googlesource.com/c/platform/external/vulkan-headers/+/2339803

Change-Id: I54ff6b124c1750330a2b63edcfc1179e12d688bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>