Merge "Merge "Fix set_buffers_damage in VulkanSurface" into qt-dev am: 8d8d704cf7" into qt-dev-plus-aosp
am: 9a50fa5ceb

Change-Id: Ibf157e442dabe29ca8e625ec7c6e63875d536416