Merge "DO NOT MERGE Bump up the max persisted uri grants am: 5a293b8eb2 am: 2654c4465e am: 230f15dde0" into rvc-qpr-dev-plus-aosp