Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW" am: d74d81bf6e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648722

Change-Id: I26272360eb5856b9f92ab32f584e4ff70e568f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>