diff --git a/DEPS b/DEPS
index ec654c17261917..52e0c653f36b7f 100644
--- a/DEPS
+++ b/DEPS
@@ -315,11 +315,11 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling android_sdk_build-tools_version
   # and whatever else without interference from each other.
-  'android_sdk_build-tools_version': '8LZujEmLjSh0g3JciDA3cslSptxKs9HOa_iUPXkOeYQC',
+  'android_sdk_build-tools_version': 'tRoD45SCi7UleQqSV7MrMQO1_e5P8ysphkCcj6z_cCQC',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling android_sdk_emulator_version
   # and whatever else without interference from each other.
-  'android_sdk_emulator_version': 'A4EvXZUIuQho0QRDJopMUpgyp6NA3aiDQjGKPUKbowMC',
+  'android_sdk_emulator_version': 'gMHhUuoQRKfxr-MBn3fNNXZtkAVXtOwMwT7kfx8jkIgC',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling android_sdk_extras_version
   # and whatever else without interference from each other.
@@ -331,15 +331,15 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling android_sdk_platform-tools_version
   # and whatever else without interference from each other.
-  'android_sdk_platform-tools_version': '8tF0AOj7Dwlv4j7_nfkhxWB0jzrvWWYjEIpirt8FIWYC',
+  'android_sdk_platform-tools_version': 'qi_k82nm6j9nz4dQosOoqXew4_TFAy8rcGOHDLptx1sC',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling android_sdk_platforms_version
   # and whatever else without interference from each other.
-  'android_sdk_platforms_version': 'YMUu9EHNZ__2Xcxl-KsaSf-dI5TMt_P62IseUVsxktMC',
+  'android_sdk_platforms_version': 'lL3IGexKjYlwjO_1Ga-xwxgwbE_w-lmi2Zi1uOlWUIAC',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling android_sdk_sources_version
   # and whatever else without interference from each other.
-  'android_sdk_sources_version': '4gxhM8E62bvZpQs7Q3d0DinQaW0RLCIefhXrQBFkNy8C',
+  'android_sdk_sources_version': 'n7svc8KYah-i4s8zwkVa85SI3_H0WFOniP0mpwNdFO0C',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -788,8 +788,8 @@ deps = {
   'src/third_party/android_system_sdk': {
       'packages': [
           {
-              'package': 'chromium/third_party/android_system_sdk',
-              'version': 'no8ss5nRg6uYDM08HboypuIQuix7bS1kVqRGyWmwP-YC',
+              'package': 'chromium/third_party/android_system_sdk/public',
+              'version': 'oSfDIvHlCa6W0gS79Q5OOfB9E4eBg3uAvi3BEDN21U0C',
           },
       ],
       'condition': 'checkout_android',
@@ -837,7 +837,7 @@ deps = {
   'src/third_party/android_sdk/public': {
       'packages': [
           {
-              'package': 'chromium/third_party/android_sdk/public/build-tools/30.0.1',
+              'package': 'chromium/third_party/android_sdk/public/build-tools/31.0.0',
               'version': Var('android_sdk_build-tools_version'),
           },
           {
@@ -857,16 +857,16 @@ deps = {
               'version': Var('android_sdk_platform-tools_version'),
           },
           {
-              'package': 'chromium/third_party/android_sdk/public/platforms/android-30',
+              'package': 'chromium/third_party/android_sdk/public/platforms/android-31',
               'version': Var('android_sdk_platforms_version'),
           },
           {
-              'package': 'chromium/third_party/android_sdk/public/sources/android-29',
+              'package': 'chromium/third_party/android_sdk/public/sources/android-30',
               'version': Var('android_sdk_sources_version'),
           },
           {
               'package': 'chromium/third_party/android_sdk/public/cmdline-tools',
-              'version': 'V__2Ycej-H2-6AcXX5A3gi7sIk74SuN44PBm2uC_N1sC',
+              'version': 'ZT3JmI6GMG4YVcZ1OtECRVMOLLJAWAdPbi-OclubJLMC',
           },
       ],
       'condition': 'checkout_android_native_support',
diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
index 81eb9adb5a40e7..ef8ad3493a7b54 100644
--- a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
@@ -2,8 +2,8 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.webview"
-    platformBuildVersionCode="30"
-    platformBuildVersionName="11"
+    platformBuildVersionCode="31"
+    platformBuildVersionName="12"
     android:isolatedSplits="true">
   <queries>  # DIFF-ANCHOR: 0c3a615d
     <intent>  # DIFF-ANCHOR: 28c960ba
@@ -15,7 +15,7 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31"/>
   <application
       android:name="org.chromium.android_webview.nonembedded.WebViewApkApplication"
       android:extractNativeLibs="True"
diff --git a/android_webview/expectations/trichrome_webview_bundle.AndroidManifest.expected b/android_webview/expectations/trichrome_webview_bundle.AndroidManifest.expected
index ea959fe2675fa9..bb577f28dd0a78 100644
--- a/android_webview/expectations/trichrome_webview_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/trichrome_webview_bundle.AndroidManifest.expected
@@ -2,8 +2,8 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.webview"
-    platformBuildVersionCode="30"
-    platformBuildVersionName="11"
+    platformBuildVersionCode="31"
+    platformBuildVersionName="12"
     android:isolatedSplits="true">
   <queries>  # DIFF-ANCHOR: 0c3a615d
     <intent>  # DIFF-ANCHOR: 28c960ba
@@ -15,7 +15,7 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="30"/>
+  <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="31"/>
   <application
       android:name="org.chromium.android_webview.nonembedded.WebViewApkApplication"
       android:extractNativeLibs="False"
diff --git a/android_webview/glue/BUILD.gn b/android_webview/glue/BUILD.gn
index fde2018257da0d..52ba8712c6f198 100644
--- a/android_webview/glue/BUILD.gn
+++ b/android_webview/glue/BUILD.gn
@@ -73,6 +73,7 @@ android_library("glue_java") {
     "java/src/com/android/webview/chromium/WebViewChromiumFactoryProviderForP.java",
     "java/src/com/android/webview/chromium/WebViewChromiumFactoryProviderForQ.java",
     "java/src/com/android/webview/chromium/WebViewChromiumFactoryProviderForR.java",
+    "java/src/com/android/webview/chromium/WebViewChromiumFactoryProviderForS.java",
     "java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java",
     "java/src/com/android/webview/chromium/WebViewDatabaseAdapter.java",
     "java/src/com/android/webview/chromium/WebViewDelegateFactory.java",
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/GlueApiHelperForR.java b/android_webview/glue/java/src/com/android/webview/chromium/GlueApiHelperForR.java
index f3aee533624a2c..f1f55dacd916f8 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/GlueApiHelperForR.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/GlueApiHelperForR.java
@@ -25,4 +25,8 @@ private GlueApiHelperForR() {}
     public static PacProcessor getPacProcessor() {
         return PacProcessorImpl.getInstance();
     }
+
+    public static PacProcessor createPacProcessor() {
+        return PacProcessorImpl.createInstance();
+    }
 }
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/PacProcessorImpl.java b/android_webview/glue/java/src/com/android/webview/chromium/PacProcessorImpl.java
index d53c875ceff712..36d9fd7be698ec 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/PacProcessorImpl.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/PacProcessorImpl.java
@@ -4,14 +4,17 @@
 
 package com.android.webview.chromium;
 
+import android.annotation.TargetApi;
+import android.net.Network;
 import android.webkit.PacProcessor;
 
 import org.chromium.android_webview.AwPacProcessor;
 import org.chromium.base.JNIUtils;
 import org.chromium.base.library_loader.LibraryLoader;
 
+@TargetApi(28)
 final class PacProcessorImpl implements PacProcessor {
-    private PacProcessorImpl() {
+    static {
         JNIUtils.setClassLoader(WebViewChromiumFactoryProvider.class.getClassLoader());
         LibraryLoader.getInstance().ensureInitialized();
 
@@ -19,19 +22,46 @@ private PacProcessorImpl() {
         AwPacProcessor.initializeEnvironment();
     }
 
-    private static final PacProcessorImpl sInstance = new PacProcessorImpl();
+    private static class LazyHolder {
+        static final PacProcessorImpl sInstance = new PacProcessorImpl();
+    }
+
+    AwPacProcessor mProcessor;
 
-    public static PacProcessorImpl getInstance() {
-        return sInstance;
+    private PacProcessorImpl() {
+        mProcessor = new AwPacProcessor();
+    }
+
+    public static PacProcessor getInstance() {
+        return LazyHolder.sInstance;
+    }
+
+    public static PacProcessor createInstance() {
+        return new PacProcessorImpl();
+    }
+
+    @Override
+    public void release() {
+        mProcessor.destroy();
     }
 
     @Override
     public boolean setProxyScript(String script) {
-        return AwPacProcessor.getInstance().setProxyScript(script);
+        return mProcessor.setProxyScript(script);
     }
 
     @Override
     public String findProxyForUrl(String url) {
-        return AwPacProcessor.getInstance().makeProxyRequest(url);
+        return mProcessor.makeProxyRequest(url);
+    }
+
+    @Override
+    public void setNetwork(Network network) {
+        mProcessor.setNetwork(network);
+    }
+
+    @Override
+    public Network getNetwork() {
+        return mProcessor.getNetwork();
     }
 }
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index 97254914f6b881..463d7bfac46971 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -330,7 +330,7 @@ private void initialize(WebViewDelegate webViewDelegate) {
                     multiProcess, packageId);
 
             // Enable modern SameSite cookie behavior if the app targets at least S.
-            if (BuildInfo.targetsAtLeastS()) {
+            if (ctx.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.S) {
                 CommandLine cl = CommandLine.getInstance();
                 cl.appendSwitch(AwSwitches.WEBVIEW_ENABLE_MODERN_COOKIE_SAME_SITE);
             }
@@ -791,4 +791,9 @@ public static void setWebLayerRunningInSameProcess() {
     public PacProcessor getPacProcessor() {
         return GlueApiHelperForR.getPacProcessor();
     }
+
+    @Override
+    public PacProcessor createPacProcessor() {
+        return GlueApiHelperForR.createPacProcessor();
+    }
 }
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProviderForS.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProviderForS.java
new file mode 100644
index 00000000000000..cab3d4fbfeb686
--- /dev/null
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProviderForS.java
@@ -0,0 +1,15 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package com.android.webview.chromium;
+
+class WebViewChromiumFactoryProviderForS extends WebViewChromiumFactoryProvider {
+    public static WebViewChromiumFactoryProvider create(android.webkit.WebViewDelegate delegate) {
+        return new WebViewChromiumFactoryProviderForS(delegate);
+    }
+
+    protected WebViewChromiumFactoryProviderForS(android.webkit.WebViewDelegate delegate) {
+        super(delegate);
+    }
+}
diff --git a/android_webview/java/src/org/chromium/android_webview/common/DeveloperModeUtils.java b/android_webview/java/src/org/chromium/android_webview/common/DeveloperModeUtils.java
index 1a155821376745..eac1acd1303469 100644
--- a/android_webview/java/src/org/chromium/android_webview/common/DeveloperModeUtils.java
+++ b/android_webview/java/src/org/chromium/android_webview/common/DeveloperModeUtils.java
@@ -15,7 +15,6 @@
 import androidx.annotation.RequiresApi;
 
 import org.chromium.android_webview.common.services.ServiceNames;
-import org.chromium.base.BuildInfo;
 import org.chromium.base.ContextUtils;
 
 import java.util.HashMap;
@@ -67,7 +66,7 @@ private static void startDeveloperUiService(String webViewPackageName) {
         try {
             context.startForegroundService(intent);
         } catch (IllegalStateException e) {
-            assert BuildInfo.isAtLeastS()
+            assert Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
                 : "Unable to start DeveloperUiService, this is only expected on Android S";
         }
     }
diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/services/DeveloperUiService.java b/android_webview/nonembedded/java/src/org/chromium/android_webview/services/DeveloperUiService.java
index 4a33b84769ccd6..56a414b94576eb 100644
--- a/android_webview/nonembedded/java/src/org/chromium/android_webview/services/DeveloperUiService.java
+++ b/android_webview/nonembedded/java/src/org/chromium/android_webview/services/DeveloperUiService.java
@@ -28,7 +28,6 @@
 import org.chromium.android_webview.common.FlagOverrideHelper;
 import org.chromium.android_webview.common.ProductionSupportedFlagList;
 import org.chromium.android_webview.common.services.IDeveloperUiService;
-import org.chromium.base.BuildInfo;
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.IntentUtils;
@@ -92,7 +91,7 @@ public void setFlagOverrides(Map overriddenFlags) {
                     try {
                         enableDeveloperMode();
                     } catch (IllegalStateException e) {
-                        assert BuildInfo.isAtLeastS()
+                        assert Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
                             : "Unable enable developer mode, this is only expected on Android S";
                         String msg = "Unable to create foreground service (client is likely in "
                                 + "background). Continuing as a background service.";
diff --git a/base/android/java/src/org/chromium/base/BuildInfo.java b/base/android/java/src/org/chromium/base/BuildInfo.java
index deca13f9177a7e..0fddbf249c90da 100644
--- a/base/android/java/src/org/chromium/base/BuildInfo.java
+++ b/base/android/java/src/org/chromium/base/BuildInfo.java
@@ -34,10 +34,6 @@ public class BuildInfo {
     private static PackageInfo sBrowserPackageInfo;
     private static boolean sInitialized;
 
-    // TODO(crbug.com/1192402): Replace this with Build.VERSION_CODES.S in the code once chromium
-    // import Android S SDK.
-    public static final int ANDROID_S_API_SDK_INT = 31;
-
     /** Not a member variable to avoid creating the instance early (it is set early in start up). */
     private static String sFirebaseAppId = "";
 
diff --git a/base/android/java/src/org/chromium/base/compat/ApiHelperForS.java b/base/android/java/src/org/chromium/base/compat/ApiHelperForS.java
index ac77f313e692c7..13a01d62c280bf 100644
--- a/base/android/java/src/org/chromium/base/compat/ApiHelperForS.java
+++ b/base/android/java/src/org/chromium/base/compat/ApiHelperForS.java
@@ -9,27 +9,23 @@
 import android.content.ClipData;
 import android.content.ClipDescription;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Process;
 import android.view.textclassifier.TextLinks;
 
 import androidx.annotation.NonNull;
 
 import org.chromium.base.ApiCompatibilityUtils;
-import org.chromium.base.BuildInfo;
 import org.chromium.base.ContextUtils;
-import org.chromium.base.Log;
 import org.chromium.base.annotations.VerifiesOnS;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 /**
  * Utility class to use new APIs that were added in S (API level 31). These need to exist in a
  * separate class so that Android framework can successfully verify classes without
  * encountering the new APIs.
  */
 @VerifiesOnS
-@TargetApi(BuildInfo.ANDROID_S_API_SDK_INT)
+@TargetApi(Build.VERSION_CODES.S)
 public final class ApiHelperForS {
     private static final String TAG = "ApiHelperForS";
 
@@ -39,13 +35,7 @@ private ApiHelperForS() {}
      * See {@link ClipDescription#isStyleText()}.
      */
     public static boolean isStyleText(ClipDescription clipDescription) {
-        try {
-            Method isStyledTextMethod = ClipDescription.class.getDeclaredMethod("isStyledText");
-            return (boolean) isStyledTextMethod.invoke(clipDescription);
-        } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
-            Log.e(TAG, "Failed to invoke ClipDescription#isStyledText() ", e);
-            return false;
-        }
+        return clipDescription.isStyledText();
     }
 
     /**
@@ -53,28 +43,14 @@ public static boolean isStyleText(ClipDescription clipDescription) {
      */
     public static float getConfidenceScore(
             ClipDescription clipDescription, @NonNull String entityType) {
-        try {
-            Method getConfidenceScoreMethod =
-                    ClipDescription.class.getDeclaredMethod("getConfidenceScore", String.class);
-            return (float) getConfidenceScoreMethod.invoke(clipDescription, entityType);
-        } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException
-                | IllegalStateException e) {
-            Log.e(TAG, "Failed to invoke ClipDescription#getConfidenceScore() ", e);
-            return 0;
-        }
+        return clipDescription.getConfidenceScore(entityType);
     }
 
     /**
      * See {@link ClipData.Item#getTextLinks()}.
      */
     public static TextLinks getTextLinks(ClipData.Item item) {
-        try {
-            Method getTextLinksMethod = ClipData.Item.class.getDeclaredMethod("getTextLinks");
-            return (TextLinks) getTextLinksMethod.invoke(item);
-        } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
-            Log.e(TAG, "Failed to invoke ClipData.Item#getTextLinks() ", e);
-            return null;
-        }
+        return item.getTextLinks();
     }
 
     public static boolean hasBluetoothConnectPermission() {
@@ -90,13 +66,6 @@ public static boolean hasBluetoothConnectPermission() {
      */
     public static void setAutoEnterEnabled(
             PictureInPictureParams.Builder builder, boolean enabled) {
-        try {
-            Method setAutoEnterEnabledMethod =
-                    PictureInPictureParams.Builder.class.getDeclaredMethod(
-                            "setAutoEnterEnabled", boolean.class);
-            setAutoEnterEnabledMethod.invoke(builder, enabled);
-        } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
-            Log.e(TAG, "Failed to invoke PictureInPictureParams.Builder#setAutoEnterEnabled() ", e);
-        }
+        builder.setAutoEnterEnabled(enabled);
     }
 }
diff --git a/build/android/gyp/merge_manifest.py b/build/android/gyp/merge_manifest.py
index 9d77aa5fe6bec4..d0a93a8c78f78f 100755
--- a/build/android/gyp/merge_manifest.py
+++ b/build/android/gyp/merge_manifest.py
@@ -26,8 +26,8 @@
                  'guava-28.1-jre.jar'),
     os.path.join('external', 'kotlin-plugin-ij', 'Kotlin', 'kotlinc', 'lib',
                  'kotlin-stdlib.jar'),
-    os.path.join('external', 'com', 'google', 'code', 'gson', 'gson', '2.8.5',
-                 'gson-2.8.5.jar'),
+    os.path.join('external', 'com', 'google', 'code', 'gson', 'gson', '2.8.6',
+                 'gson-2.8.6.jar'),
 ]
 
 
diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py
index b0c1574c0cbf8b..e87b8fe67d841b 100644
--- a/build/android/pylib/constants/__init__.py
+++ b/build/android/pylib/constants/__init__.py
@@ -115,7 +115,7 @@
 
 SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')
 
-ANDROID_SDK_BUILD_TOOLS_VERSION = '30.0.1'
+ANDROID_SDK_BUILD_TOOLS_VERSION = '31.0.0'
 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party', 'android_sdk',
                                 'public')
 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 88fd0a32b7ae82..e7540e8be1e015 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -89,10 +89,10 @@ if (is_android || is_chromeos) {
   }
 
   public_android_sdk_root = "//third_party/android_sdk/public"
-  if (android_sdk_release == "r") {
+  if (android_sdk_release == "s") {
     default_android_sdk_root = public_android_sdk_root
-    default_android_sdk_version = "30"
-    default_android_sdk_build_tools_version = "30.0.1"
+    default_android_sdk_version = "31"
+    default_android_sdk_build_tools_version = "31.0.0"
     public_android_sdk = true
   }
 
@@ -105,7 +105,7 @@ if (is_android || is_chromeos) {
     # Purposefully repeated so that downstream can change
     # default_android_sdk_root without changing lint version.
     default_lint_android_sdk_root = public_android_sdk_root
-    default_lint_android_sdk_version = 30
+    default_lint_android_sdk_version = 31
   }
 
   if (!defined(default_extras_android_sdk_root)) {
diff --git a/build/config/android/sdk.gni b/build/config/android/sdk.gni
index d2e67a7d4be22b..854717016714f3 100644
--- a/build/config/android/sdk.gni
+++ b/build/config/android/sdk.gni
@@ -4,7 +4,7 @@
 
 # The default SDK release used by public builds. Value may differ in
 # internal builds.
-default_android_sdk_release = "r"
+default_android_sdk_release = "s"
 
 # SDK releases against which public builds are supported.
-public_sdk_releases = [ "r" ]
+public_sdk_releases = [ "s" ]
diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml
index 57d9b134dbe5be..37462070671edf 100644
--- a/chrome/android/expectations/lint-suppressions.xml
+++ b/chrome/android/expectations/lint-suppressions.xml
@@ -65,7 +65,6 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md
   </issue>
   <issue id="MissingPermission" severity="ignore"/>
   <issue id="MissingQuantity" severity="ignore"/>
-  <issue id="MissingRegistered" severity="ignore"/>
   <issue id="MissingTranslation">
     <ignore regexp="restriction_values.xml.*"/>
   </issue>
diff --git a/chrome/android/expectations/monochrome_public_bundle.AndroidManifest.expected b/chrome/android/expectations/monochrome_public_bundle.AndroidManifest.expected
index 8eceb614263f8c..7953e2adeb1e18 100644
--- a/chrome/android/expectations/monochrome_public_bundle.AndroidManifest.expected
+++ b/chrome/android/expectations/monochrome_public_bundle.AndroidManifest.expected
@@ -2,8 +2,8 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.chromium.chrome.stable"
-    platformBuildVersionCode="30"
-    platformBuildVersionName="11"
+    platformBuildVersionCode="31"
+    platformBuildVersionName="12"
     android:isolatedSplits="true">
   <permission android:name="$PACKAGE.TOS_ACKED" android:protectionLevel="signatureOrSystem"/>
   <permission android:name="$PACKAGE.permission.C2D_MESSAGE" android:protectionLevel="signature"/>
@@ -59,14 +59,16 @@
   <uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS"/>
   <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
   <uses-permission-sdk-23 android:name="android.permission.ACCESS_WIFI_STATE"/>
-  <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH"/>
-  <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN"/>
+  <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30"/>
+  <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30"/>
+  <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_CONNECT"/>
+  <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation"/>
   <uses-permission-sdk-23 android:name="android.permission.READ_CONTACTS"/>
   <uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
   <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
   <uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
   <uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
-  <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="30"/>
+  <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="31"/>
   <application
       android:name="org.chromium.chrome.browser.base.SplitMonochromeApplication"
       android:allowAudioPlaybackCapture="false"
diff --git a/chrome/android/expectations/trichrome_chrome_bundle.AndroidManifest.expected b/chrome/android/expectations/trichrome_chrome_bundle.AndroidManifest.expected
index 4596e454e4eb9c..6cdf8aab34c875 100644
--- a/chrome/android/expectations/trichrome_chrome_bundle.AndroidManifest.expected
+++ b/chrome/android/expectations/trichrome_chrome_bundle.AndroidManifest.expected
@@ -2,8 +2,8 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.chromium.chrome.stable"
-    platformBuildVersionCode="30"
-    platformBuildVersionName="11"
+    platformBuildVersionCode="31"
+    platformBuildVersionName="12"
     android:isolatedSplits="true">
   <permission android:name="$PACKAGE.TOS_ACKED" android:protectionLevel="signatureOrSystem"/>
   <permission android:name="$PACKAGE.permission.C2D_MESSAGE" android:protectionLevel="signature"/>
@@ -59,14 +59,16 @@
   <uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS"/>
   <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
   <uses-permission-sdk-23 android:name="android.permission.ACCESS_WIFI_STATE"/>
-  <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH"/>
-  <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN"/>
+  <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30"/>
+  <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30"/>
+  <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_CONNECT"/>
+  <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation"/>
   <uses-permission-sdk-23 android:name="android.permission.READ_CONTACTS"/>
   <uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
   <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
   <uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
   <uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
-  <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="30"/>
+  <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="31"/>
   <application
       android:name="org.chromium.chrome.browser.base.SplitChromeApplication"
       android:allowAudioPlaybackCapture="false"
diff --git a/chrome/android/expectations/trichrome_library_apk.AndroidManifest.expected b/chrome/android/expectations/trichrome_library_apk.AndroidManifest.expected
index ca3ed1c9178003..fd2f714f62b201 100644
--- a/chrome/android/expectations/trichrome_library_apk.AndroidManifest.expected
+++ b/chrome/android/expectations/trichrome_library_apk.AndroidManifest.expected
@@ -2,12 +2,12 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.chromium.trichromelibrary"
-    platformBuildVersionCode="30"
-    platformBuildVersionName="11">
+    platformBuildVersionCode="31"
+    platformBuildVersionName="12">
   <uses-feature android:glEsVersion="0x00020000"/>
   <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
   <uses-feature android:name="android.software.leanback" android:required="false"/>
-  <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="30"/>
+  <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="31"/>
   <application
       android:extractNativeLibs="false"
       android:icon="@drawable/icon_webview"
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
index 7818c8c5cb7bb3..1f1d760bebae9b 100644
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
@@ -114,6 +114,8 @@ public void setToolbar(Toolbar toolbar) {
     }
 
     @Override
+    // TODO(crbug.com/1231201): work out why this is causing a lint error
+    @SuppressWarnings("Override")
     public boolean gatherTransparentRegion(Region region) {
         // Reset the translation on the control container before attempting to compute the
         // transparent region.
diff --git a/components/browser_ui/banners/android/java/src/org/chromium/components/browser_ui/banners/SwipableOverlayView.java b/components/browser_ui/banners/android/java/src/org/chromium/components/browser_ui/banners/SwipableOverlayView.java
index 9d7211df697559..dbd5cac3a603f5 100644
--- a/components/browser_ui/banners/android/java/src/org/chromium/components/browser_ui/banners/SwipableOverlayView.java
+++ b/components/browser_ui/banners/android/java/src/org/chromium/components/browser_ui/banners/SwipableOverlayView.java
@@ -425,6 +425,8 @@ protected boolean isAllowedToAutoHide() {
      * this ensures no child animation within this view's layout will be clipped by a SurfaceView.
      */
     @Override
+    // TODO(crbug.com/1231201): work out why this is causing a lint error
+    @SuppressWarnings("Override")
     public boolean gatherTransparentRegion(Region region) {
         float translationY = getTranslationY();
         setTranslationY(0);
diff --git a/third_party/android_sdk/README.chromium b/third_party/android_sdk/README.chromium
index ef5c34a525bb72..5f531a5102ea3c 100644
--- a/third_party/android_sdk/README.chromium
+++ b/third_party/android_sdk/README.chromium
@@ -1,12 +1,12 @@
 Name: Android SDK
 URL: http://developer.android.com/sdk/index.html
-Version: 30
-  Android SDK Build-tools 30.0.1
-  Android SDK Command-line Tools 3.0
-  Android SDK Emulator 30.0.12
-  Android SDK Platform-tools 30.0.3
-  Android SDK Platform API 30
-  Android SDK Sources 29
+Version: 31
+  Android SDK Build-tools 31.0.0
+  Android SDK Command-line Tools 4.0
+  Android SDK Emulator 30.7.5
+  Android SDK Platform-tools 31.0.2
+  Android SDK Platform API 31
+  Android SDK Sources 30
   SDK Patch Applier v4
 Security Critical: no
 License: Apache Version 2.0
diff --git a/third_party/android_system_sdk/README.chromium b/third_party/android_system_sdk/README.chromium
index 1f5747450a318d..a819b1bf13518f 100644
--- a/third_party/android_system_sdk/README.chromium
+++ b/third_party/android_system_sdk/README.chromium
@@ -2,7 +2,7 @@ Name: Android System SDK
 URL: https://android.googlesource.com/platform/frameworks/base
 Short Name:  Android System SDK
 Version: 0
-Revision: RPB2.200611.009
+Revision: SPB3.210618.010
 License: GPL v2
 License File: LICENSE
 Security Critical: No
diff --git a/tools/android/eclipse/.classpath b/tools/android/eclipse/.classpath
index 37d5107274ccfd..66e0c1ee62734b 100644
--- a/tools/android/eclipse/.classpath
+++ b/tools/android/eclipse/.classpath
@@ -299,7 +299,7 @@ to the classpath for downstream development. See "additional_entries" below.
     <classpathentry kind="src" path="url/android/java/src"/>
     <classpathentry kind="src" path="url/android/javatests/src"/>
     <classpathentry kind="src" path="weblayer/browser/android/javatests/src"/>
-    <classpathentry kind="lib" path="../src/third_party/android_sdk/public/platforms/android-30/android.jar" sourcepath="../src/third_party/android_sdk/public/sources/">
+    <classpathentry kind="lib" path="../src/third_party/android_sdk/public/platforms/android-31/android.jar" sourcepath="../src/third_party/android_sdk/public/sources/">
         <attributes>
             <attribute name="javadoc_location" value="http://developer.android.com/reference/"/>
         </attributes>
diff --git a/ui/android/javatests/src/org/chromium/ui/base/ClipboardAndroidTest.java b/ui/android/javatests/src/org/chromium/ui/base/ClipboardAndroidTest.java
index 5e2308eeec5e01..ed900f44424cd6 100644
--- a/ui/android/javatests/src/org/chromium/ui/base/ClipboardAndroidTest.java
+++ b/ui/android/javatests/src/org/chromium/ui/base/ClipboardAndroidTest.java
@@ -7,6 +7,7 @@
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
+import android.os.Build;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.style.BackgroundColorSpan;
@@ -18,7 +19,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.chromium.base.BuildInfo;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.Batch;
 import org.chromium.base.test.util.CallbackHelper;
@@ -149,7 +149,7 @@ public void hasUrlAndGetUrlTest() {
     // Only first URL is returned on S+ if clipboard contains multiple URLs.
     @Test
     @SmallTest
-    @MinAndroidSdkLevel(BuildInfo.ANDROID_S_API_SDK_INT)
+    @MinAndroidSdkLevel(Build.VERSION_CODES.S)
     public void hasUrlAndGetUrlMixTextAndLinkTest() {
         TestThreadUtils.runOnUiThreadBlocking(
                 () -> { Clipboard.getInstance().setText(MIX_TEXT_URL); });
@@ -163,7 +163,7 @@ public void hasUrlAndGetUrlMixTextAndLinkTest() {
     // Only first URL is returned on S+ if clipboard contains multiple URLs.
     @Test
     @SmallTest
-    @MinAndroidSdkLevel(BuildInfo.ANDROID_S_API_SDK_INT)
+    @MinAndroidSdkLevel(Build.VERSION_CODES.S)
     public void hasUrlAndGetUrlMixTextAndLinkWithoutProtocolTest() {
         TestThreadUtils.runOnUiThreadBlocking(
                 () -> { Clipboard.getInstance().setText(MIX_TEXT_URL_NO_PROTOCOL); });