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: 8316fc3c am: 29161eeb am: 3a03b61f am: b2db20f2 am: 6998864b" into udc-qpr-dev-plus-aosp am: 1e6a948b

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



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