Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs

Exempt-From-Owner-Approval: Cherry-picking from master

Test: build / treehugger
Bug: 146727827
Change-Id: Ie1ad6711c490c679ebcfacd97154380a8810ba1c
Merged-in: Ie1ad6711c490c679ebcfacd97154380a8810ba1c
diff --git a/java/android/annotation/SystemApi.java b/java/android/annotation/SystemApi.java
index 4ac0098..a468439 100644
--- a/java/android/annotation/SystemApi.java
+++ b/java/android/annotation/SystemApi.java
@@ -23,7 +23,6 @@
 import static java.lang.annotation.ElementType.PACKAGE;
 import static java.lang.annotation.ElementType.TYPE;
 
-import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -41,7 +40,6 @@
  */
 @Target({TYPE, FIELD, METHOD, CONSTRUCTOR, ANNOTATION_TYPE, PACKAGE})
 @Retention(RetentionPolicy.RUNTIME)
-@Repeatable(SystemApi.Container.class) // TODO(b/146727827): make this non-repeatable
 public @interface SystemApi {
     enum Client {
         /**