Merge changes from topic "revert-2064289-vkcmd-OTJMALPHRK" am: e92b48b89e

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

Change-Id: I9063fac10e9f4a98f87fea157cf27e8d248febdb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>