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

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

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