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

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

Change-Id: Ib518ffa5be638239f8d3655c8e3e6194e93cce9b