Merge "Work around fix for "libvtswidevine32.so" not found (HIDL versions) am: 79819a085d am: 8316fc3c3d am: 29161eeb07 am: 3a03b61f7a am: b2db20f22d am: 6998864b3b" into udc-qpr-dev-plus-aosp