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

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

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