Merge "tests: Avoid leak of va_list" am: 8078ea5580

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1597524

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I544cdfaccadeea0215e568b36fe08c5e9d9d4449