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

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

Change-Id: Ie97ededdb969e62dbf462399c3239594fb579cb2