[automerger skipped] DO NOT MERGE Bump up the max persisted uri grants am: 5a293b8e am: de5e89eb am: 88bc57ed am: 42b4ee3e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I651631372db119415a8bcaaafbf1f413ea70c2dd