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

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



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