[automerger skipped] Merge "Adding additional reporting to tests and features" into oc-dev am: 61f1a76d33 am: 4493bdcb03 -s ours am: 32ac8b8028 -s ours am: 89e3e87927 -s ours

am skip reason: Change-Id I23d4a50673067b15e26b20dcdbee3dfe585b0331 with SHA-1 bdb01430ac is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12515588

Change-Id: I0f5b8b914ea748a10e33422ab34d5d1c5bb9bc61