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

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

Change-Id: Ib24f5aac6d5e1c323d289b32069ac96626489263