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

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

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