[automerger skipped] Merge "DO NOT MERGE Bump up the max persisted uri grants...

[automerger skipped] Merge "DO NOT MERGE Bump up the max persisted uri grants am: 5a293b8e am: 2654c446 am: 230f15dd" into rvc-qpr-dev-plus-aosp am: b54c69fd -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib6617fcda9abf5c680a1ccdf948130897477b7d2