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

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

Change-Id: Ib6c667c5b830d22555f9abea0c6b33ae9cef83cc