Non-generic grants also need forceUriPermissions.

The recently adjusted logic created a regression where we didn't
always honor the forceUriPermissions flag from a provider; we need
to consider it both in the "generic" case where we don't know the
target and in the "non-generic" case where we know where the grant
is destined.

Bug: 154962874
Test: atest FrameworksServicesTests:com.android.server.uri
Test: atest CtsAppSecurityHostTestCases:android.appsecurity.cts.ExternalStorageHostTest
Change-Id: Ica89ee977e29e084a74e66f49d28d3aed10fe1f3
3 files changed