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

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

Change-Id: I4a050eb393c7344d93ed326f7a79ee1081e5c043