Merge changes from topic "vulkan-header-1.2.158" am: 373e4fd03e am: 64f80d1b45

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1465688

Change-Id: I13d65b55da08bdd54ea06483a10d2c279d6f5572