Merge "Don't require treble & O MR1 in AnnotationTest." am: 7e19616e1f am: 48c5ad6644 am: d77f34b467

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

Change-Id: Ic45adab8905f255b8e248e4e7684d711ba2a19d4