Merge "Make VtsHalBootAidlTargetTest failures easier to debug." into main