Merge changes from topic "cm_vintf_workaround" am: 8c45f4ab87 am: 944b55764d

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

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