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

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

Change-Id: Iaae44c0fa9a8be5ec174d08cbf9e24b6d6a6a39a