diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 8e688582a3bad..e608440918f76 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -2692,7 +2692,7 @@ package android.content {
     field public static final String BATTERY_STATS_SERVICE = "batterystats";
     field @Deprecated public static final int BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS = 1048576; // 0x100000
     field public static final int BIND_ALLOW_FOREGROUND_SERVICE_STARTS_FROM_BACKGROUND = 262144; // 0x40000
-    field public static final String CLOUDSEARCH_SERVICE = "cloudsearch_service";
+    field public static final String CLOUDSEARCH_SERVICE = "cloudsearch";
     field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";
     field public static final String CONTEXTHUB_SERVICE = "contexthub";
     field public static final String ETHERNET_SERVICE = "ethernet";
diff --git a/core/api/system-lint-baseline.txt b/core/api/system-lint-baseline.txt
index dbb427467a680..e17a9bb1512cd 100644
--- a/core/api/system-lint-baseline.txt
+++ b/core/api/system-lint-baseline.txt
@@ -294,7 +294,6 @@ SamShouldBeLast: android.webkit.WebChromeClient#onShowFileChooser(android.webkit
 
 
 ServiceName: android.content.Context#CLOUDSEARCH_SERVICE:
-    Inconsistent service value; expected `cloudsearch`, was `cloudsearch_service` (Note: Do not change the name of already released services, which will break tools using `adb shell dumpsys`. Instead add `@SuppressLint("ServiceName"))`
 
 
 UserHandleName: android.app.search.SearchAction.Builder#setUserHandle(android.os.UserHandle):
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 4b4e00855ac1b..0b8a8a23aee44 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -4987,10 +4987,8 @@ public abstract class Context {
      * @hide
      * @see #getSystemService(String)
      */
-    // TODO(216507592): Change cloudsearch_service to cloudsearch.
     @SystemApi
-    @SuppressLint("ServiceName")
-    public static final String CLOUDSEARCH_SERVICE = "cloudsearch_service";
+    public static final String CLOUDSEARCH_SERVICE = "cloudsearch";
 
     /**
      * Use with {@link #getSystemService(String)} to access the