Merge "Non-generic grants also need forceUriPermissions." into rvc-dev am: 7732d1f8 am: a794e9ea Change-Id: Iab8ee9c8d9a7a058b75d74e817a48362b4cb4fbc