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

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

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