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

Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW" am: d74d81bf am: a10ed15f am: 579e7bae am: a777c543 am: ef4267d4 am: 6cd4c57b

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



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