Merge changes from topic "cm_vintf_workaround" am: 8c45f4ab87

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

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