[automerger skipped] DO NOT MERGE Bump up the max persisted uri grants am:...

[automerger skipped] DO NOT MERGE Bump up the max persisted uri grants am: 5a293b8e am: 2654c446 am: 5d61d001 am: 2f351952 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105684

Change-Id: Ibdfa8ddab605e5a08d72d9968fb4b1907ad1c552