Merge "Work around fix for "libvtswidevine32.so" not found (HIDL versions) am: 79819a085d am: 10853c6c2a am: 0794b5ebf4" into udc-dev-plus-aosp