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

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

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