Merge "Fix AM.revokeUriPermissionFromOwner for prefix mode."