am 95b1bbfe: Merge "Fix the build" into klp-dev

* commit '95b1bbfe6c8fe5072d80e027d4b25319ed6f0411':
  Fix the build

core/java/android/provider/Settings.java

@@ -4373,6 +4373,20 @@ public final class Settings {
         /** @hide */
         public static final String TRANSIENT_NAV_CONFIRMATIONS = "transient_nav_confirmations";
 
+        /**
+         * This is the query URI for finding a print service to install.
+         *
+         * @hide
+         */
+        public static final String PRINT_SERVICE_SEARCH_URI = "print_service_search_uri";
+
+        /**
+         * This is the query URI for finding a NFC payment service to install.
+         *
+         * @hide
+         */
+        public static final String PAYMENT_SERVICE_SEARCH_URI = "payment_service_search_uri";
+
         /**
          * This are the settings to be backed up.
          *