Merge "Merge "Non-generic grants also need forceUriPermissions." into rvc-dev...
Merge "Merge "Non-generic grants also need forceUriPermissions." into rvc-dev am: 7732d1f8 am: 58c7b4bc" into rvc-d1-dev-plus-aosp am: ca0ce1c9
Change-Id: I3bbbf20a26aad8dceb4c97ca83ca4b2a5a4c5473