Merge "Format VTS test code" am: e0ade8fe67 am: 1e58a2b6dd am: 7f651d40ee am: b68ed1a322 am: 9fd342b411 am: 21116128b1

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

Change-Id: Iad8f8d821a616349a2556dfed12e779137093947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>