Merge changes from topic "cm_vintf_workaround" am: 8c45f4ab am: 944b5576...

Merge changes from topic "cm_vintf_workaround" am: 8c45f4ab am: 944b5576 am: f7776a0d am: 97c9dc80 am: 47a55489

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



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