Merge "Actually run tests." into main am: aa8a701e40 am: 39ffff0a71

Original change: https://android-review.googlesource.com/c/platform/development/+/2812605

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