Merge "Work around fix for "libvtswidevine32.so" not found (HIDL versions) am:...

Merge "Work around fix for "libvtswidevine32.so" not found (HIDL versions) am: 79819a08 am: 10853c6c am: 0794b5eb" into udc-dev-plus-aosp am: 49153fec am: 499bd805

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



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