Merge "Weaver: modify default HAL for passing VTS" am: 2697d16c43 am: 21af98f74c am: 3405632a1f am: b357ac04c7

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

Change-Id: I0a455d2671889ba856a220a2bc405cf1714f8ea4