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

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

Change-Id: I9d1102e5311e2aaa64d191659fc8c4583f086f15