Merge "Add missing @Test annotations" am: 32359f03b1

Original change: https://android-review.googlesource.com/c/platform/tools/metalava/+/2031163

Change-Id: Ie36d4399c32cb1293530cd4be55c57e6338975d6