Merge changes from topic "vk-198-reland" am: bc29f5e284 am: 798d3cdec8

Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/1937688

Change-Id: Ie2d608871b95f79eddf375d32ed5d0dc5a677c8d