diff --git a/framework/Android.bp b/framework/Android.bp
index 182c558b37..655a32c01a 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -22,6 +22,10 @@ package {
 // In the branch which does not support FlaggedAPI, use this default to ignore the annotated APIs.
 java_defaults {
     name: "FlaggedApiDefaults",
+    api_dir: "udc-extended-api",
+    droiddoc_options: [
+      "--hide-annotation android.annotation.FlaggedApi",
+    ],
 }
 
 // The above variables may have different values