Merge cherrypicks of [11694540, 11688182] into rvc-release

Change-Id: Id2dc9b35ea864bed969f08d949a03b73a0724bd6

Author: android-build-team Robot

services/core/java/com/android/server/uri/UriGrantsManagerService.java

@@ -114,7 +114,7 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub {
     private static final String TAG = "UriGrantsManagerService";
     // Maximum number of persisted Uri grants a package is allowed
     private static final int MAX_PERSISTED_URI_GRANTS = 128;
-    private static final boolean ENABLE_DYNAMIC_PERMISSIONS = true;
+    private static final boolean ENABLE_DYNAMIC_PERMISSIONS = false;
 
     private final Object mLock = new Object();
     private final H mH;